From 10769f04cc843f847993bda41ccff01c374c339a Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Sun, 16 Nov 2003 18:50:57 +0000 Subject: [PATCH] bitkeeper revision 1.606 (3fb7c711FIosxWIF_j9XSEkZmDWlug) dev.c, dom_mem_ops.c: Bug fixes. --- xen/common/dom_mem_ops.c | 2 +- xen/net/dev.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c index 8f59e10d51..2e8696c533 100644 --- a/xen/common/dom_mem_ops.c +++ b/xen/common/dom_mem_ops.c @@ -111,7 +111,7 @@ static long free_dom_mem(struct task_struct *p, reservation_decrease_t op) pf = &frame_table[mpfn]; if ( (pf->type_count != 0) || (pf->tot_count != 0) || - (pf->flags & PG_domain_mask != p->domain) ) + ((pf->flags & PG_domain_mask) != p->domain) ) { DPRINTK("Bad page free for domain %d (%ld, %ld, %08lx)\n", p->domain, pf->type_count, pf->tot_count, pf->flags); diff --git a/xen/net/dev.c b/xen/net/dev.c index 81b50cf4c1..3ecec620e7 100644 --- a/xen/net/dev.c +++ b/xen/net/dev.c @@ -1967,7 +1967,8 @@ static int get_tx_bufs(net_vif_t *vif) skb->len = tx.size - ETH_HLEN; unmap_domain_mem(skb->head); - netif_rx(skb); + if ( netif_rx(skb) == NET_RX_DROP ) + kfree_skb(skb); __make_tx_response(vif, tx.id, RING_STATUS_OK); } -- 2.30.2